From 1178aceac240d13f4cc184d520bac81ab77564ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Wed, 29 Aug 2018 23:51:50 +0200 Subject: [PATCH] babl-fish-reference: disable a fast-code path that sometimes is invalid --- babl/babl-fish-reference.c | 4 ++-- babl/babl-fish.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c index 7ae5455..c813225 100644 --- a/babl/babl-fish-reference.c +++ b/babl/babl-fish-reference.c @@ -758,7 +758,7 @@ babl_fish_reference_process (const Babl *babl, else { source_float_buf_alloc = babl_malloc (sizeof (float) * n * - BABL (babl->fish.source)->format.model->components); + (BABL (babl->fish.source)->format.model->components)); source_float_buf = source_float_buf_alloc; source_image = babl_image_from_linear ( @@ -773,7 +773,7 @@ babl_fish_reference_process (const Babl *babl, ); } - if (babl_model_is ((void*)babl->fish.source->format.model, "RGBA")) + if (babl_model_is ((void*)babl->fish.source->format.model, "RGBA") && 0) { rgba_float_buf = source_float_buf; rgba_image = babl_image_from_linear ( diff --git a/babl/babl-fish.c b/babl/babl-fish.c index a1baa50..0976de6 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -119,6 +119,7 @@ babl_conversion_find (const void *source, const void *destination) { void *data = (void*)destination; + babl_list_each (BABL (source)->type.from_list, match_conversion, &data); if (data != (void*)destination) /* didn't change */ return data; -- 2.30.2